prefer-remote-fetch: fix fetchurl eval#457086
Merged
Mic92 merged 1 commit intoNixOS:masterfrom Oct 31, 2025
Merged
Conversation
13 tasks
SuperSandro2000
force-pushed
the
prefer-remote-fetch-fetchurl
branch
from
3ffa1e0 to
e6dc008
Compare
ShamrockLee
reviewed
Oct 30, 2025
Comment on lines
25
to
27
| fetchurl = args: super.fetchurl (super.lib.extends | ||
| (super.lib.toExtension { preferLocalBuild = args.preferLocalBuild or false; }) | ||
| (super.lib.toFunction args)); |
Contributor
There was a problem hiding this comment.
Sorry, I forgot to consider that args might be a function when writing args.prefenLocalBuild or false.
It should be
Suggested change
| fetchurl = args: super.fetchurl (super.lib.extends | |
| (super.lib.toExtension { preferLocalBuild = args.preferLocalBuild or false; }) | |
| (super.lib.toFunction args)); | |
| fetchurl = fpArgs: super.fetchurl (super.lib.extends | |
| (finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }) | |
| (super.lib.toFunction fpArgs)); |
Or,
Suggested change
| fetchurl = args: super.fetchurl (super.lib.extends | |
| (super.lib.toExtension { preferLocalBuild = args.preferLocalBuild or false; }) | |
| (super.lib.toFunction args)); | |
| fetchurl = lib.extendMkDerivation { | |
| constructDrv = previous.fetchurl; | |
| extendDrvArgs = finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }; | |
| } |
The latter handles the __functionArgs automatically.
Member
Author
There was a problem hiding this comment.
The 2nd failed with:
error:
… while calling the 'head' builtin
at /home/sandro/src/nixpkgs/lib/attrsets.nix:1696:13:
1695| if length values == 1 || pred here (elemAt values 1) (head values) then
1696| head values
| ^
1697| else
… while evaluating the attribute 'value'
at /home/sandro/src/nixpkgs/lib/modules.nix:1118:7:
1117| // {
1118| value = addErrorContext "while evaluating the option `${showOption loc}':" value;
| ^
1119| inherit (res.defsFinal') highestPrio;
… while evaluating the option `system.build.toplevel':
… while evaluating definitions from `/nix/store/p5jrkni7q6pa7ckfyqrrjysqh8i5nmdf-source/nixos/modules/system/activation/top-level.nix':
… while evaluating the option `system.activationScripts':
… while evaluating definitions from `/nix/store/6mis9m031ia3c7fmxh3gqrq4782dmppn-source/modules/ssh.nix':
(stack trace truncated; use '--show-trace' to show the full, detailed trace)
error: function 'extendDrvArgs' called with unexpected argument 'prefetchLocalBuild'
at /home/sandro/src/nixpkgs/pkgs/build-support/fetchurl/default.nix:72:5:
71| finalAttrs:
72| {
| ^
73| # URL to fetch.
Contributor
There was a problem hiding this comment.
The 2nd failed with:
That's due to a typo. It should be preferLocalBuild instead of prefetchLocalBuild.
Contributor
There was a problem hiding this comment.
Updated. Sorry for the trouble.
nixpkgs-ci
bot
added
10.rebuild-darwin: 0
SuperSandro2000
force-pushed
the
prefer-remote-fetch-fetchurl
branch
3 times, most recently
from
555d2bf to
dc24b58
Compare
SuperSandro2000
force-pushed
the
prefer-remote-fetch-fetchurl
branch
from
dc24b58 to
bd107d4
Compare
philiptaron
reviewed
Oct 31, 2025
Contributor
philiptaron
left a comment
philiptaron
left a comment
There was a problem hiding this comment.
Wow, this is convoluted.
Is there a test for these derivation mutators (a phrase I just made up) @SuperSandro2000 that I should run to make sure it's not broken?
Member
Author
|
Probably not but it would probably be as easy as just evalling pkgs with it as an overlay |
Member
|
Maybe it can be added to lib-tests? |
philiptaron
added a commit
to philiptaron/nixpkgs
that referenced
this pull request
Oct 31, 2025
…r internals Replaces NixOS#457086
1 task
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 9, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
andre4ik3
pushed a commit
to andre4ik3/nixpkgs
that referenced
this pull request
Dec 12, 2025
…r internals Replaces NixOS#457086
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 13, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 14, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 16, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
andre4ik3
pushed a commit
to andre4ik3/nixpkgs
that referenced
this pull request
Dec 16, 2025
…r internals Replaces NixOS#457086
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 18, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 19, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 20, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 23, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 25, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
andre4ik3
pushed a commit
to andre4ik3/nixpkgs
that referenced
this pull request
Dec 29, 2025
…r internals Replaces NixOS#457086
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Dec 31, 2025
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Jan 2, 2026
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Jan 2, 2026
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
SuperSandro2000
pushed a commit
to SuperSandro2000/nixpkgs
that referenced
this pull request
Jan 3, 2026
…r internals Replaces NixOS#457086 (cherry picked from commit 8d2dad0)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.